From 7808c397e36cd00e3c697bc6cf472119d0752e39 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Tue, 26 Jul 2005 17:38:33 +0000 Subject: [PATCH] Clean up xenbus code not to use priorities. Signed-off-by: Rusty Russel Signed-off-by: Christian Limpach --- linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c | 10 +++------- linux-2.6-xen-sparse/include/asm-xen/xenbus.h | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c index 118069237b..6b5735d809 100644 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c @@ -409,18 +409,14 @@ int xenbus_gather(const char *dir, ...) return ret; } -static int xs_watch(const char *path, const char *token, unsigned int priority) +static int xs_watch(const char *path, const char *token) { - char prio[32]; - struct kvec iov[3]; + struct kvec iov[2]; - sprintf(prio, "%u", priority); iov[0].iov_base = (void *)path; iov[0].iov_len = strlen(path) + 1; iov[1].iov_base = (void *)token; iov[1].iov_len = strlen(token) + 1; - iov[2].iov_base = prio; - iov[2].iov_len = strlen(prio) + 1; return xs_error(xs_talkv(XS_WATCH, iov, ARRAY_SIZE(iov), NULL)); } @@ -479,7 +475,7 @@ int register_xenbus_watch(struct xenbus_watch *watch) sprintf(token, "%lX", (long)watch); BUG_ON(find_watch(token)); - err = xs_watch(watch->node, token, watch->priority); + err = xs_watch(watch->node, token); if (!err) list_add(&watch->list, &watches); return err; diff --git a/linux-2.6-xen-sparse/include/asm-xen/xenbus.h b/linux-2.6-xen-sparse/include/asm-xen/xenbus.h index 6d36ee7b86..f0dfa83d9c 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/xenbus.h +++ b/linux-2.6-xen-sparse/include/asm-xen/xenbus.h @@ -109,7 +109,6 @@ struct xenbus_watch { struct list_head list; char *node; - unsigned int priority; void (*callback)(struct xenbus_watch *, const char *node); }; -- 2.30.2